Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <[email protected]>
Tue, 29 Nov 2016 15:28:28 +0000 (16:28 +0100)
committerStefano Babic <[email protected]>
Tue, 29 Nov 2016 15:28:28 +0000 (16:28 +0100)
Signed-off-by: Stefano Babic <[email protected]>

Trivial merge